cssvalue: Constify a bunch of APIs

diff --git a/gtk/gtkcssshorthandpropertyimpl.c b/gtk/gtkcssshorthandpropertyimpl.c
index 9684dc4e1bbdafea29f36f8102d97bc1d14cde69..05a027c53e87d53a3fdbe495ba6967fbd901a29c 100644 (file)
--- a/gtk/gtkcssshorthandpropertyimpl.c
+++ b/gtk/gtkcssshorthandpropertyimpl.c
@@ -664,7 +664,7 @@ pack_border_radius (GtkCssShorthandProperty *shorthand,
                     GtkStyleQueryFunc        query_func,
                     gpointer                 query_data)
 {
-  GtkCssBorderCornerRadius *top_left;
+  const GtkCssBorderCornerRadius *top_left;
   GtkCssStyleProperty *prop;
   GtkCssValue *v;
   int value = 0;

diff --git a/gtk/gtkcssstylepropertyimpl.c b/gtk/gtkcssstylepropertyimpl.c
index f69e9174ba542cd3b500bc8cc90654b66b907da3..3edcb94669d48adbc7e80e65238b425328aa9ce0 100644 (file)
--- a/gtk/gtkcssstylepropertyimpl.c
+++ b/gtk/gtkcssstylepropertyimpl.c
@@ -675,7 +675,7 @@ background_size_compute (GtkCssStyleProperty    *property,
                          GtkStyleContext        *context,
                          GtkCssValue            *specified)
 {
-  GtkCssBackgroundSize *ssize = _gtk_css_value_get_background_size (specified);
+  const GtkCssBackgroundSize *ssize = _gtk_css_value_get_background_size (specified);
   GtkCssBackgroundSize csize;
   gboolean changed;
 
@@ -852,7 +852,7 @@ background_position_compute (GtkCssStyleProperty    *property,
                             GtkStyleContext        *context,
                             GtkCssValue            *specified)
 {
-  GtkCssBackgroundPosition *spos = _gtk_css_value_get_background_position (specified);
+  const GtkCssBackgroundPosition *spos = _gtk_css_value_get_background_position (specified);
   GtkCssBackgroundPosition cpos;
   gboolean changed;
 

diff --git a/gtk/gtkcssvalue.c b/gtk/gtkcssvalue.c
index ef1103bdba82e25385452a3c8e63fb175244a785..ab56bfa9862b54fd977bed8b725dbb1af294f581 100644 (file)
--- a/gtk/gtkcssvalue.c
+++ b/gtk/gtkcssvalue.c
@@ -493,7 +493,7 @@ _gtk_css_value_get_special_kind  (GtkCssValue *value)
   return value->u.gint;
 }
 
-GtkCssNumber *
+const GtkCssNumber *
 _gtk_css_value_get_number  (GtkCssValue *value)
 {
   g_return_val_if_fail (_gtk_css_value_holds (value, GTK_TYPE_CSS_NUMBER), NULL);
@@ -572,28 +572,28 @@ _gtk_css_value_get_border_style (GtkCssValue *value)
   return value->u.gint;
 }
 
-GtkCssBackgroundSize *
+const GtkCssBackgroundSize *
 _gtk_css_value_get_background_size (GtkCssValue *value)
 {
   g_return_val_if_fail (_gtk_css_value_holds (value, GTK_TYPE_CSS_BACKGROUND_SIZE), NULL);
   return value->u.ptr;
 }
 
-GtkCssBackgroundPosition *
+const GtkCssBackgroundPosition *
 _gtk_css_value_get_background_position (GtkCssValue *value)
 {
   g_return_val_if_fail (_gtk_css_value_holds (value, GTK_TYPE_CSS_BACKGROUND_POSITION), NULL);
   return value->u.ptr;
 }
 
-GtkCssBorderImageRepeat *
+const GtkCssBorderImageRepeat *
 _gtk_css_value_get_border_image_repeat (GtkCssValue *value)
 {
   g_return_val_if_fail (_gtk_css_value_holds (value, GTK_TYPE_CSS_BORDER_IMAGE_REPEAT), NULL);
   return value->u.ptr;
 }
 
-GtkCssBorderCornerRadius *
+const GtkCssBorderCornerRadius *
 _gtk_css_value_get_border_corner_radius (GtkCssValue *value)
 {
   g_return_val_if_fail (_gtk_css_value_holds (value, GTK_TYPE_CSS_BORDER_CORNER_RADIUS), NULL);
@@ -628,7 +628,7 @@ _gtk_css_value_get_pango_weight (GtkCssValue *value)
   return value->u.gint;
 }
 
-GdkRGBA *
+const GdkRGBA *
 _gtk_css_value_get_rgba (GtkCssValue *value)
 {
   g_return_val_if_fail (_gtk_css_value_holds (value, GDK_TYPE_RGBA), NULL);

diff --git a/gtk/gtkcssvalueprivate.h b/gtk/gtkcssvalueprivate.h
index 49f77157572c77428346410e42660b3ba29d9ac8..d925b71e7f8618155c071b5f04521505ec1094a8 100644 (file)
--- a/gtk/gtkcssvalueprivate.h
+++ b/gtk/gtkcssvalueprivate.h
@@ -64,31 +64,31 @@ GtkCssValue *_gtk_css_value_new_from_background_position (const GtkCssBackground
 void         _gtk_css_value_init_gvalue               (GtkCssValue                *value,
                                                       GValue                     *g_value);
 
-gboolean                  _gtk_css_value_is_special                 (GtkCssValue *value);
-GtkCssSpecialValue        _gtk_css_value_get_special_kind           (GtkCssValue *value);
-int                       _gtk_css_value_get_int                    (GtkCssValue *value);
-double                    _gtk_css_value_get_double                 (GtkCssValue *value);
-const char *              _gtk_css_value_get_string                 (GtkCssValue *value);
-gpointer                  _gtk_css_value_dup_object                 (GtkCssValue *value);
-gpointer                  _gtk_css_value_get_object                 (GtkCssValue *value);
-gpointer                  _gtk_css_value_get_boxed                  (GtkCssValue *value);
-const char **             _gtk_css_value_get_strv                   (GtkCssValue *value);
-GtkCssNumber             *_gtk_css_value_get_number                 (GtkCssValue *value);
-GtkSymbolicColor         *_gtk_css_value_get_symbolic_color         (GtkCssValue *value);
-GtkCssImage              *_gtk_css_value_get_image                  (GtkCssValue *value);
-GtkBorderStyle            _gtk_css_value_get_border_style           (GtkCssValue *value);
-GtkCssBackgroundSize     *_gtk_css_value_get_background_size        (GtkCssValue *value);
-GtkCssBackgroundPosition *_gtk_css_value_get_background_position    (GtkCssValue *value);
-GtkCssBorderCornerRadius *_gtk_css_value_get_border_corner_radius   (GtkCssValue *value);
-GtkCssBorderImageRepeat  *_gtk_css_value_get_border_image_repeat    (GtkCssValue *value);
-PangoFontDescription *    _gtk_css_value_get_font_description       (GtkCssValue *value);
-PangoStyle                _gtk_css_value_get_pango_style            (GtkCssValue *value);
-PangoVariant              _gtk_css_value_get_pango_variant          (GtkCssValue *value);
-PangoWeight               _gtk_css_value_get_pango_weight           (GtkCssValue *value);
-GdkRGBA                  *_gtk_css_value_get_rgba                   (GtkCssValue *value);
-cairo_pattern_t          *_gtk_css_value_get_pattern                (GtkCssValue *value);
-GtkGradient              *_gtk_css_value_get_gradient               (GtkCssValue *value);
-GtkShadow                *_gtk_css_value_get_shadow                 (GtkCssValue *value);
+gboolean                        _gtk_css_value_is_special                 (GtkCssValue *value);
+GtkCssSpecialValue              _gtk_css_value_get_special_kind           (GtkCssValue *value);
+int                             _gtk_css_value_get_int                    (GtkCssValue *value);
+double                          _gtk_css_value_get_double                 (GtkCssValue *value);
+const char *                    _gtk_css_value_get_string                 (GtkCssValue *value);
+gpointer                        _gtk_css_value_dup_object                 (GtkCssValue *value);
+gpointer                        _gtk_css_value_get_object                 (GtkCssValue *value);
+gpointer                        _gtk_css_value_get_boxed                  (GtkCssValue *value);
+const char **                   _gtk_css_value_get_strv                   (GtkCssValue *value);
+const GtkCssNumber             *_gtk_css_value_get_number                 (GtkCssValue *value);
+GtkSymbolicColor               *_gtk_css_value_get_symbolic_color         (GtkCssValue *value);
+GtkCssImage                    *_gtk_css_value_get_image                  (GtkCssValue *value);
+GtkBorderStyle                  _gtk_css_value_get_border_style           (GtkCssValue *value);
+const GtkCssBackgroundSize     *_gtk_css_value_get_background_size        (GtkCssValue *value);
+const GtkCssBackgroundPosition *_gtk_css_value_get_background_position    (GtkCssValue *value);
+const GtkCssBorderCornerRadius *_gtk_css_value_get_border_corner_radius   (GtkCssValue *value);
+const GtkCssBorderImageRepeat  *_gtk_css_value_get_border_image_repeat    (GtkCssValue *value);
+PangoFontDescription *          _gtk_css_value_get_font_description       (GtkCssValue *value);
+PangoStyle                      _gtk_css_value_get_pango_style            (GtkCssValue *value);
+PangoVariant                    _gtk_css_value_get_pango_variant          (GtkCssValue *value);
+PangoWeight                     _gtk_css_value_get_pango_weight           (GtkCssValue *value);
+const GdkRGBA                  *_gtk_css_value_get_rgba                   (GtkCssValue *value);
+cairo_pattern_t                *_gtk_css_value_get_pattern                (GtkCssValue *value);
+GtkGradient                    *_gtk_css_value_get_gradient               (GtkCssValue *value);
+GtkShadow                      *_gtk_css_value_get_shadow                 (GtkCssValue *value);
 
 G_END_DECLS
 

diff --git a/gtk/gtkthemingbackground.c b/gtk/gtkthemingbackground.c
index 89d0acc652386eb95d31b753c7ecf62b159201b2..fee860652588b5fae2701c484e9ed4b1dc2134a4 100644 (file)
--- a/gtk/gtkthemingbackground.c
+++ b/gtk/gtkthemingbackground.c
@@ -161,8 +161,8 @@ _gtk_theming_background_paint (GtkThemingBackground *bg,
       && bg->image_rect.height > 0)
     {
       GtkCssBackgroundRepeat hrepeat, vrepeat;
-      GtkCssBackgroundSize *size;
-      GtkCssBackgroundPosition *pos;
+      const GtkCssBackgroundSize *size;
+      const GtkCssBackgroundPosition *pos;
       double image_width, image_height;
       double width, height;